Change in openvpn[master]: Use mbedtls_ssl_export_keying_material()
A message that is not in the archive (sent off-list or not yet received): gerrit.1747746380000.I1204bc2ff85952160a86f0b9d1caae90e5065bc4@...2715...
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
to review the following change.
Change subject: Use mbedtls_ssl_export_keying_material()
......................................................................
Use mbedtls_ssl_export_keying_material()
Mbed TLS now has an implementation of the TLS-Exporter feature (though not yet in a released version). Use it if it's available.
---
M CMakeLists.txt
M configure.ac
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_mbedtls.h
4 files changed, 48 insertions(+), 18 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/1041/1
CMakeLists.txt +1 -0
@@ -302,6 +302,7 @@ check_symbol_exists(mbedtls_ctr_drbg_update_ret mbedtls/ctr_drbg.h HAVE_MBEDTLS_CTR_DRBG_UPDATE_RET) check_symbol_exists(mbedtls_ssl_conf_export_keys_ext_cb mbedtls/ssl.h HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB) check_symbol_exists(mbedtls_ssl_set_export_keys_cb mbedtls/ssl.h HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB) + check_symbol_exists(mbedtls_ssl_export_keying_material mbedtls/ssl.h HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL) check_include_files(psa/crypto.h HAVE_MBEDTLS_PSA_CRYPTO_H) endfunction()
configure.ac +18 -9
@@ -1065,19 +1065,28 @@ ) have_export_keying_material="yes" + AC_CHECK_FUNC( - [mbedtls_ssl_conf_export_keys_ext_cb], - [AC_DEFINE([HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB], [1], [yes])], - [AC_DEFINE([HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB], [0], [no])] + [mbedtls_ssl_export_keying_material], + AC_DEFINE([HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL], [1], + [Have mbedtls_ssl_export_keying_material]) ) - if test "x$ac_cv_func_mbedtls_ssl_conf_export_keys_ext_cb" != xyes; then + + if test "x$ac_cv_func_mbedtls_ssl_export_keying_material" != xyes; then AC_CHECK_FUNC( - [mbedtls_ssl_set_export_keys_cb], - [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [1], [yes])], - [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [0], [no])] + [mbedtls_ssl_conf_export_keys_ext_cb], + [AC_DEFINE([HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB], [1], [yes])], + [AC_DEFINE([HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB], [0], [no])] ) - if test "x$ac_cv_func_mbedtls_ssl_set_export_keys_cb" != xyes; then - have_export_keying_material="no" + if test "x$ac_cv_func_mbedtls_ssl_conf_export_keys_ext_cb" != xyes; then + AC_CHECK_FUNC( + [mbedtls_ssl_set_export_keys_cb], + [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [1], [yes])], + [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [0], [no])] + ) + if test "x$ac_cv_func_mbedtls_ssl_set_export_keys_cb" != xyes; then + have_export_keying_material="no" + fi fi fi
src/openvpn/ssl_mbedtls.c +20 -4
@@ -253,8 +253,8 @@memcpy (cache->master_secret, secret,sizeof (cache->master_secret)); cache->tls_prf_type = tls_prf_type; } -#else /* if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ -#error either HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB or HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB must be defined when HAVE_EXPORT_KEYING_MATERIAL is defined +#elif !HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL +#error HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB, HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB or HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL must be set when HAVE_EXPORT_KEYING_MATERIAL is defined#endif /* HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ bool
@@ -264,6 +264,20 @@ {ASSERT (strlen (label) == label_size); +#if HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL +/* Our version of mbed TLS has a built-in TLS-Exporter. */ + +mbedtls_ssl_context *ctx = session->key[KS_PRIMARY ].ks_ssl.ctx; +if (mbed_ok (mbedtls_ssl_export_keying_material (ctx, ekm, ekm_size, label, label_size,NULL ,0 ,0 ))) + { +return true; + } +else + { +return false; + } + +#else struct tls_key_cache *cache = &session->key[KS_PRIMARY ].ks_ssl.tls_key_cache;/* If the type is NONE, we either have no cached secrets or
@@ -288,7 +302,9 @@secure_memzero (ekm, session->opt->ekm_size);return false; } +#endif /* HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL */ } +#else /* ifdef HAVE_EXPORT_KEYING_MATERIAL */ bool key_state_export_keying_material(struct tls_session *session,
@@ -1238,7 +1254,7 @@mbedtls_ssl_conf_max_tls_version (ks_ssl->ssl_config, version); } -#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB +#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB && !HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL /* Initialize keying material exporter, old style. */ mbedtls_ssl_conf_export_keys_ext_cb (ks_ssl->ssl_config, mbedtls_ssl_export_keys_cb, session);
@@ -1253,7 +1269,7 @@* verification. */ ASSERT (mbed_ok (mbedtls_ssl_set_hostname (ks_ssl->ctx,NULL ))); -#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB +#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB && !HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL /* Initialize keying material exporter, new style. */ mbedtls_ssl_set_export_keys_cb (ks_ssl->ctx, mbedtls_ssl_export_keys_cb, session);#endif
src/openvpn/ssl_mbedtls.h +9 -5
@@ -85,16 +85,20 @@void *sign_ctx; }; -#ifdef HAVE_EXPORT_KEYING_MATERIAL -/** struct to cache TLS secrets for keying material exporter (RFC 5705). -* The constants (64 and 48) are inherent to TLS version and -* the whole keying material export will likely change when they change */ +#if defined(HAVE_EXPORT_KEYING_MATERIAL ) && !HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL +/** +* struct to cache TLS secrets for keying material exporter (RFC 5705). +* Not needed if the library itself implements the keying material exporter, +* or if we can't obtain the secrets anyway. +* +* The constants 64 and 48 are inherent to TLS 1.2. For TLS 1.3, it is not +* possible to obtain the exporter master secret from mbed TLS. */ struct tls_key_cache {unsigned char client_server_random[64 ];mbedtls_tls_prf_types tls_prf_type;unsigned char master_secret[48 ]; }; -#else /* ifdef HAVE_EXPORT_KEYING_MATERIAL */ +#else /* if defined(HAVE_EXPORT_KEYING_MATERIAL) && !HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL */ struct tls_key_cache { };#endif
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1204bc2ff85952160a86f0b9d1caae90e5065bc4
Gerrit-Change-Number: 1041
Gerrit-PatchSet: 1
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
to look at the new patch set (#2).
Change subject: Use mbedtls_ssl_export_keying_material()
......................................................................
Use mbedtls_ssl_export_keying_material()
Mbed TLS now has an implementation of the TLS-Exporter feature (though not yet in a released version). Use it if it's available.
---
M CMakeLists.txt
M configure.ac
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_mbedtls.h
4 files changed, 48 insertions(+), 18 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/1041/2
CMakeLists.txt +1 -0
@@ -302,6 +302,7 @@ check_symbol_exists(mbedtls_ctr_drbg_update_ret mbedtls/ctr_drbg.h HAVE_MBEDTLS_CTR_DRBG_UPDATE_RET) check_symbol_exists(mbedtls_ssl_conf_export_keys_ext_cb mbedtls/ssl.h HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB) check_symbol_exists(mbedtls_ssl_set_export_keys_cb mbedtls/ssl.h HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB) + check_symbol_exists(mbedtls_ssl_export_keying_material mbedtls/ssl.h HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL) check_include_files(psa/crypto.h HAVE_MBEDTLS_PSA_CRYPTO_H) endfunction()
configure.ac +18 -9
@@ -1065,19 +1065,28 @@ ) have_export_keying_material="yes" + AC_CHECK_FUNC( - [mbedtls_ssl_conf_export_keys_ext_cb], - [AC_DEFINE([HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB], [1], [yes])], - [AC_DEFINE([HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB], [0], [no])] + [mbedtls_ssl_export_keying_material], + AC_DEFINE([HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL], [1], + [Have mbedtls_ssl_export_keying_material]) ) - if test "x$ac_cv_func_mbedtls_ssl_conf_export_keys_ext_cb" != xyes; then + + if test "x$ac_cv_func_mbedtls_ssl_export_keying_material" != xyes; then AC_CHECK_FUNC( - [mbedtls_ssl_set_export_keys_cb], - [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [1], [yes])], - [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [0], [no])] + [mbedtls_ssl_conf_export_keys_ext_cb], + [AC_DEFINE([HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB], [1], [yes])], + [AC_DEFINE([HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB], [0], [no])] ) - if test "x$ac_cv_func_mbedtls_ssl_set_export_keys_cb" != xyes; then - have_export_keying_material="no" + if test "x$ac_cv_func_mbedtls_ssl_conf_export_keys_ext_cb" != xyes; then + AC_CHECK_FUNC( + [mbedtls_ssl_set_export_keys_cb], + [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [1], [yes])], + [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [0], [no])] + ) + if test "x$ac_cv_func_mbedtls_ssl_set_export_keys_cb" != xyes; then + have_export_keying_material="no" + fi fi fi
src/openvpn/ssl_mbedtls.c +20 -4
@@ -253,8 +253,8 @@memcpy (cache->master_secret, secret,sizeof (cache->master_secret)); cache->tls_prf_type = tls_prf_type; } -#else /* if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ -#error either HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB or HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB must be defined when HAVE_EXPORT_KEYING_MATERIAL is defined +#elif !HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL +#error HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB, HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB or HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL must be set when HAVE_EXPORT_KEYING_MATERIAL is defined#endif /* HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ bool
@@ -264,6 +264,20 @@ {ASSERT (strlen (label) == label_size); +#if HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL +/* Our version of mbed TLS has a built-in TLS-Exporter. */ + +mbedtls_ssl_context *ctx = session->key[KS_PRIMARY ].ks_ssl.ctx; +if (mbed_ok (mbedtls_ssl_export_keying_material (ctx, ekm, ekm_size, label, label_size,NULL ,0 ,0 ))) + { +return true; + } +else + { +return false; + } + +#else /* HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL */ struct tls_key_cache *cache = &session->key[KS_PRIMARY ].ks_ssl.tls_key_cache;/* If the type is NONE, we either have no cached secrets or
@@ -288,7 +302,9 @@secure_memzero (ekm, session->opt->ekm_size);return false; } +#endif /* HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL */ } +#else /* ifdef HAVE_EXPORT_KEYING_MATERIAL */ bool key_state_export_keying_material(struct tls_session *session,
@@ -1238,7 +1254,7 @@mbedtls_ssl_conf_max_tls_version (ks_ssl->ssl_config, version); } -#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB +#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB && !HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL /* Initialize keying material exporter, old style. */ mbedtls_ssl_conf_export_keys_ext_cb (ks_ssl->ssl_config, mbedtls_ssl_export_keys_cb, session);
@@ -1253,7 +1269,7 @@* verification. */ ASSERT (mbed_ok (mbedtls_ssl_set_hostname (ks_ssl->ctx,NULL ))); -#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB +#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB && !HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL /* Initialize keying material exporter, new style. */ mbedtls_ssl_set_export_keys_cb (ks_ssl->ctx, mbedtls_ssl_export_keys_cb, session);#endif
src/openvpn/ssl_mbedtls.h +9 -5
@@ -85,16 +85,20 @@void *sign_ctx; }; -#ifdef HAVE_EXPORT_KEYING_MATERIAL -/** struct to cache TLS secrets for keying material exporter (RFC 5705). -* The constants (64 and 48) are inherent to TLS version and -* the whole keying material export will likely change when they change */ +#if defined(HAVE_EXPORT_KEYING_MATERIAL ) && !HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL +/** +* struct to cache TLS secrets for keying material exporter (RFC 5705). +* Not needed if the library itself implements the keying material exporter, +* or if we can't obtain the secrets anyway. +* +* The constants 64 and 48 are inherent to TLS 1.2. For TLS 1.3, it is not +* possible to obtain the exporter master secret from mbed TLS. */ struct tls_key_cache {unsigned char client_server_random[64 ];mbedtls_tls_prf_types tls_prf_type;unsigned char master_secret[48 ]; }; -#else /* ifdef HAVE_EXPORT_KEYING_MATERIAL */ +#else /* if defined(HAVE_EXPORT_KEYING_MATERIAL) && !HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL */ struct tls_key_cache { };#endif
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1204bc2ff85952160a86f0b9d1caae90e5065bc4
Gerrit-Change-Number: 1041
Gerrit-PatchSet: 2
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: MaxF, flichtenheld.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email )
Change subject: Use mbedtls_ssl_export_keying_material()
......................................................................
Patch Set 2: Code-Review-1
(2 comments)
Patchset:
PS2:
the cmake detection didn't work properly for me but we should also not use that (see other comment)
So I tested with replacing !HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) in the source code to test this.
I can confirm that the patch otherwise works.
File CMakeLists.txt:
http://gerrit.openvpn.net/c/openvpn/+/1041/comment/93bf1992_f65e7263 :
PS2, Line 305: check_symbol_exists(mbedtls_ssl_export_keying_material mbedtls/ssl.h HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL)
shouldn't we rather rely on the mbed TLS configuration define MBEDTLS_SSL_KEYING_MATERIAL_EXPORT to detect this?
We have to do this cmake/configure.ac dance for the old apis since mbed TLS doesn't have a proper define but to detect if the API is available using MBEDTLS_SSL_KEYING_MATERIAL_EXPORT should work unless I am overlooking something.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1204bc2ff85952160a86f0b9d1caae90e5065bc4
Gerrit-Change-Number: 1041
Gerrit-PatchSet: 2
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: MaxF <[email protected]...>
Gerrit-Comment-Date: Thu, 22 May 2025 13:08:05 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos.
MaxF has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email )
Change subject: Use mbedtls_ssl_export_keying_material()
......................................................................
Patch Set 2:
(1 comment)
File CMakeLists.txt:
http://gerrit.openvpn.net/c/openvpn/+/1041/comment/48dc00df_b6879caa :
PS2, Line 305: check_symbol_exists(mbedtls_ssl_export_keying_material mbedtls/ssl.h HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL)
Quoted 1 line
shouldn't we rather rely on the mbed TLS configuration define
MBEDTLS_SSL_KEYING_MATERIAL_EXPORTto […]
In configure.ac, we need to check if one of the key exporting callbacks exists, or if mbedtls_ssl_export_keying_material() exists, to determine if we should set HAVE_EXPORT_KEYING_MATERIAL. Is it possible to check that a define exists in autoconf?
Alternatively, we could just refuse to compile if there's no way to export keying material, but I think I would rather do that in a different commit.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1204bc2ff85952160a86f0b9d1caae90e5065bc4
Gerrit-Change-Number: 1041
Gerrit-PatchSet: 2
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Thu, 22 May 2025 13:35:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: plaisthos <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: MaxF, flichtenheld.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email )
Change subject: Use mbedtls_ssl_export_keying_material()
......................................................................
Patch Set 2:
(1 comment)
File CMakeLists.txt:
http://gerrit.openvpn.net/c/openvpn/+/1041/comment/1d83a9bb_a8f284fc :
PS2, Line 305: check_symbol_exists(mbedtls_ssl_export_keying_material mbedtls/ssl.h HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL)
Quoted 1 line
In configure. […]
I saw your other commit and I think we can stop supporting TLS libraries that do not support export key material now.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1204bc2ff85952160a86f0b9d1caae90e5065bc4
Gerrit-Change-Number: 1041
Gerrit-PatchSet: 2
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: MaxF <[email protected]...>
Gerrit-Comment-Date: Fri, 23 May 2025 10:43:24 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: plaisthos <[email protected]...>
Comment-In-Reply-To: MaxF <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: MaxF, flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review-1 by plaisthos
Change subject: Use mbedtls_ssl_export_keying_material()
......................................................................
Use mbedtls_ssl_export_keying_material()
Mbed TLS now has an implementation of the TLS-Exporter feature (though not yet in a released version). Use it if it's available.
v2: Rebased, changed feature detection in configure.ac
---
M configure.ac
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_mbedtls.h
3 files changed, 33 insertions(+), 8 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/1041/3
configure.ac +4 -1
@@ -1072,7 +1072,10 @@ [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [0], [no])] ) if test "x$ac_cv_func_mbedtls_ssl_set_export_keys_cb" != xyes; then - AC_MSG_ERROR(This version of mbed TLS has no support for exporting key material.) + AC_CHECK_FUNC([mbedtls_ssl_export_keying_material]) + if test "x$ac_cv_func_mbedtls_ssl_export_keying_material" != xyes; then + AC_MSG_ERROR(This version of mbed TLS has no support for exporting key material.) + fi fi fi
src/openvpn/ssl_mbedtls.c +19 -4
@@ -251,8 +251,8 @@memcpy (cache->master_secret, secret,sizeof (cache->master_secret)); cache->tls_prf_type = tls_prf_type; } -#else /* if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ -#error either mbedtls_ssl_conf_export_keys_ext_cb or mbedtls_ssl_set_export_keys_cb must be available in mbed TLS +#elif !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) +#error mbedtls_ssl_conf_export_keys_ext_cb, mbedtls_ssl_set_export_keys_cb or mbedtls_ssl_export_keying_material must be available in mbed TLS#endif /* HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ bool
@@ -262,6 +262,20 @@ {ASSERT (strlen (label) == label_size); +#if defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT ) +/* Our version of mbed TLS has a built-in TLS-Exporter. */ + +mbedtls_ssl_context *ctx = session->key[KS_PRIMARY ].ks_ssl.ctx; +if (mbed_ok (mbedtls_ssl_export_keying_material (ctx, ekm, ekm_size, label, label_size,NULL ,0 ,0 ))) + { +return true; + } +else + { +return false; + } + +#else /* defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ struct tls_key_cache *cache = &session->key[KS_PRIMARY ].ks_ssl.tls_key_cache;/* If the type is NONE, we either have no cached secrets or
@@ -286,6 +300,7 @@secure_memzero (ekm, session->opt->ekm_size); return false; } +#endif /* defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ }bool
@@ -1226,7 +1241,7 @@mbedtls_ssl_conf_max_tls_version (ks_ssl->ssl_config, version); } -#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB +#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT )/* Initialize keying material exporter, old style. */ mbedtls_ssl_conf_export_keys_ext_cb (ks_ssl->ssl_config, mbedtls_ssl_export_keys_cb, session);
@@ -1241,7 +1256,7 @@* verification. */ ASSERT (mbed_ok (mbedtls_ssl_set_hostname (ks_ssl->ctx,NULL ))); -#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB +#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT )/* Initialize keying material exporter, new style. */ mbedtls_ssl_set_export_keys_cb (ks_ssl->ctx, mbedtls_ssl_export_keys_cb, session);#endif
src/openvpn/ssl_mbedtls.h +10 -3
@@ -85,14 +85,21 @@void *sign_ctx; }; -/** struct to cache TLS secrets for keying material exporter (RFC 5705). -* The constants (64 and 48) are inherent to TLS version and -* the whole keying material export will likely change when they change */ +#if !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT ) +/** +* struct to cache TLS secrets for keying material exporter (RFC 5705). +* Not needed if the library itself implements the keying material exporter. +* +* The constants 64 and 48 are inherent to TLS 1.2. For TLS 1.3, it is not +* possible to obtain the exporter master secret from mbed TLS. */ struct tls_key_cache {unsigned char client_server_random[64 ];mbedtls_tls_prf_types tls_prf_type;unsigned char master_secret[48 ]; }; +#else /* !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ +struct tls_key_cache { }; +#endif /** * Structure that wraps the TLS context. Contents differ depending on the
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1204bc2ff85952160a86f0b9d1caae90e5065bc4
Gerrit-Change-Number: 1041
Gerrit-PatchSet: 3
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: MaxF <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: MaxF, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email )
Change subject: Use mbedtls_ssl_export_keying_material()
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1204bc2ff85952160a86f0b9d1caae90e5065bc4
Gerrit-Change-Number: 1041
Gerrit-PatchSet: 3
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: MaxF <[email protected]...>
Gerrit-Comment-Date: Wed, 28 May 2025 09:26:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v3 1/1 Use mbedtls_ssl_export_keying_material()
In reply to a message not in the archiveFrom: Max Fillinger <[email protected]...>
Mbed TLS now has an implementation of the TLS-Exporter feature (though not yet in a released version). Use it if it's available.
v2: Rebased, changed feature detection in configure.ac
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1041
This mail reflects revision 3 of this Change.
Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <[email protected]...>
configure.ac +4 -1
@@ -1072,7 +1072,10 @@ [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [0], [no])] ) if test "x$ac_cv_func_mbedtls_ssl_set_export_keys_cb" != xyes; then - AC_MSG_ERROR(This version of mbed TLS has no support for exporting key material.) + AC_CHECK_FUNC([mbedtls_ssl_export_keying_material]) + if test "x$ac_cv_func_mbedtls_ssl_export_keying_material" != xyes; then + AC_MSG_ERROR(This version of mbed TLS has no support for exporting key material.) + fi fi fi
src/openvpn/ssl_mbedtls.c +19 -4
@@ -251,8 +251,8 @@memcpy (cache->master_secret, secret,sizeof (cache->master_secret)); cache->tls_prf_type = tls_prf_type; } -#else /* if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ -#error either mbedtls_ssl_conf_export_keys_ext_cb or mbedtls_ssl_set_export_keys_cb must be available in mbed TLS +#elif !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) +#error mbedtls_ssl_conf_export_keys_ext_cb, mbedtls_ssl_set_export_keys_cb or mbedtls_ssl_export_keying_material must be available in mbed TLS#endif /* HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ bool
@@ -262,6 +262,20 @@ {ASSERT (strlen (label) == label_size); +#if defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT ) +/* Our version of mbed TLS has a built-in TLS-Exporter. */ + +mbedtls_ssl_context *ctx = session->key[KS_PRIMARY ].ks_ssl.ctx; +if (mbed_ok (mbedtls_ssl_export_keying_material (ctx, ekm, ekm_size, label, label_size,NULL ,0 ,0 ))) + { +return true; + } +else + { +return false; + } + +#else /* defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ struct tls_key_cache *cache = &session->key[KS_PRIMARY ].ks_ssl.tls_key_cache;/* If the type is NONE, we either have no cached secrets or
@@ -286,6 +300,7 @@secure_memzero (ekm, session->opt->ekm_size); return false; } +#endif /* defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ }bool
@@ -1226,7 +1241,7 @@mbedtls_ssl_conf_max_tls_version (ks_ssl->ssl_config, version); } -#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB +#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT )/* Initialize keying material exporter, old style. */ mbedtls_ssl_conf_export_keys_ext_cb (ks_ssl->ssl_config, mbedtls_ssl_export_keys_cb, session);
@@ -1241,7 +1256,7 @@* verification. */ ASSERT (mbed_ok (mbedtls_ssl_set_hostname (ks_ssl->ctx,NULL ))); -#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB +#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT )/* Initialize keying material exporter, new style. */ mbedtls_ssl_set_export_keys_cb (ks_ssl->ctx, mbedtls_ssl_export_keys_cb, session);#endif
src/openvpn/ssl_mbedtls.h +10 -3
@@ -85,14 +85,21 @@void *sign_ctx; }; -/** struct to cache TLS secrets for keying material exporter (RFC 5705). -* The constants (64 and 48) are inherent to TLS version and -* the whole keying material export will likely change when they change */ +#if !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT ) +/** +* struct to cache TLS secrets for keying material exporter (RFC 5705). +* Not needed if the library itself implements the keying material exporter. +* +* The constants 64 and 48 are inherent to TLS 1.2. For TLS 1.3, it is not +* possible to obtain the exporter master secret from mbed TLS. */ struct tls_key_cache {unsigned char client_server_random[64 ];mbedtls_tls_prf_types tls_prf_type;unsigned char master_secret[48 ]; }; +#else /* !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ +struct tls_key_cache { }; +#endif /** * Structure that wraps the TLS context. Contents differ depending on the
[Openvpn-devel] [PATCH applied] Re: Use mbedtls_ssl_export_keying_material()
I could not test this myself, and neither did the buildbots (as far as I know) because we all have older mbedTLS versions - so the patch does not break anything there, at least :-)
Arne has tested this with an mbedTLS development build, and it works as it says on the lid - the new function is used, the API is called correctly, things work.
Your patch has been applied to the master branch.
commit 4c2022ab9044d4449d2f6480fcf845461f02c114
Author: Max Fillinger Date: Tue Jun 3 16:01:01 2025 +0200
Use mbedtls_ssl_export_keying_material()
Signed-off-by: Max Fillinger <[email protected]...>
Acked-by: Frank Lichtenheld <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31856.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
Attention is currently required from: MaxF, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email )
Change subject: Use mbedtls_ssl_export_keying_material()
......................................................................
Patch Set 3:
(1 comment)
File CMakeLists.txt:
http://gerrit.openvpn.net/c/openvpn/+/1041/comment/cb4b863e_7a90ad49 :
PS2, Line 305: check_symbol_exists(mbedtls_ssl_export_keying_material mbedtls/ssl.h HAVE_MBEDTLS_SSL_EXPORT_KEYING_MATERIAL)
Quoted 1 line
I saw your other commit and I think we can stop supporting TLS libraries that do not support export […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1204bc2ff85952160a86f0b9d1caae90e5065bc4
Gerrit-Change-Number: 1041
Gerrit-PatchSet: 3
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: cron2 <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: MaxF <[email protected]...>
Gerrit-Comment-Date: Tue, 03 Jun 2025 14:12:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: plaisthos <[email protected]...>
Comment-In-Reply-To: MaxF <[email protected]...>
Gerrit-MessageType: comment
cron2 has uploaded a new patch set (#4) to the change originally created by MaxF. ( http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by flichtenheld
Change subject: Use mbedtls_ssl_export_keying_material()
......................................................................
Use mbedtls_ssl_export_keying_material()
Mbed TLS now has an implementation of the TLS-Exporter feature (though not yet in a released version). Use it if it's available.
v2: Rebased, changed feature detection in configure.ac
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31856.html
---
M configure.ac
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_mbedtls.h
3 files changed, 33 insertions(+), 8 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/41/1041/4
configure.ac +4 -1
@@ -1072,7 +1072,10 @@ [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [0], [no])] ) if test "x$ac_cv_func_mbedtls_ssl_set_export_keys_cb" != xyes; then - AC_MSG_ERROR(This version of mbed TLS has no support for exporting key material.) + AC_CHECK_FUNC([mbedtls_ssl_export_keying_material]) + if test "x$ac_cv_func_mbedtls_ssl_export_keying_material" != xyes; then + AC_MSG_ERROR(This version of mbed TLS has no support for exporting key material.) + fi fi fi
src/openvpn/ssl_mbedtls.c +19 -4
@@ -251,8 +251,8 @@memcpy (cache->master_secret, secret,sizeof (cache->master_secret)); cache->tls_prf_type = tls_prf_type; } -#else /* if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ -#error either mbedtls_ssl_conf_export_keys_ext_cb or mbedtls_ssl_set_export_keys_cb must be available in mbed TLS +#elif !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) +#error mbedtls_ssl_conf_export_keys_ext_cb, mbedtls_ssl_set_export_keys_cb or mbedtls_ssl_export_keying_material must be available in mbed TLS#endif /* HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ bool
@@ -262,6 +262,20 @@ {ASSERT (strlen (label) == label_size); +#if defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT ) +/* Our version of mbed TLS has a built-in TLS-Exporter. */ + +mbedtls_ssl_context *ctx = session->key[KS_PRIMARY ].ks_ssl.ctx; +if (mbed_ok (mbedtls_ssl_export_keying_material (ctx, ekm, ekm_size, label, label_size,NULL ,0 ,0 ))) + { +return true; + } +else + { +return false; + } + +#else /* defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ struct tls_key_cache *cache = &session->key[KS_PRIMARY ].ks_ssl.tls_key_cache;/* If the type is NONE, we either have no cached secrets or
@@ -286,6 +300,7 @@secure_memzero (ekm, session->opt->ekm_size); return false; } +#endif /* defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ }bool
@@ -1226,7 +1241,7 @@mbedtls_ssl_conf_max_tls_version (ks_ssl->ssl_config, version); } -#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB +#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT )/* Initialize keying material exporter, old style. */ mbedtls_ssl_conf_export_keys_ext_cb (ks_ssl->ssl_config, mbedtls_ssl_export_keys_cb, session);
@@ -1241,7 +1256,7 @@* verification. */ ASSERT (mbed_ok (mbedtls_ssl_set_hostname (ks_ssl->ctx,NULL ))); -#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB +#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT )/* Initialize keying material exporter, new style. */ mbedtls_ssl_set_export_keys_cb (ks_ssl->ctx, mbedtls_ssl_export_keys_cb, session);#endif
src/openvpn/ssl_mbedtls.h +10 -3
@@ -85,14 +85,21 @@void *sign_ctx; }; -/** struct to cache TLS secrets for keying material exporter (RFC 5705). -* The constants (64 and 48) are inherent to TLS version and -* the whole keying material export will likely change when they change */ +#if !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT ) +/** +* struct to cache TLS secrets for keying material exporter (RFC 5705). +* Not needed if the library itself implements the keying material exporter. +* +* The constants 64 and 48 are inherent to TLS 1.2. For TLS 1.3, it is not +* possible to obtain the exporter master secret from mbed TLS. */ struct tls_key_cache {unsigned char client_server_random[64 ];mbedtls_tls_prf_types tls_prf_type;unsigned char master_secret[48 ]; }; +#else /* !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ +struct tls_key_cache { }; +#endif /** * Structure that wraps the TLS context. Contents differ depending on the
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1204bc2ff85952160a86f0b9d1caae90e5065bc4
Gerrit-Change-Number: 1041
Gerrit-PatchSet: 4
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: cron2 <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email )
Change subject: Use mbedtls_ssl_export_keying_material()
......................................................................
Use mbedtls_ssl_export_keying_material()
Mbed TLS now has an implementation of the TLS-Exporter feature (though not yet in a released version). Use it if it's available.
v2: Rebased, changed feature detection in configure.ac
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31856.html
---
M configure.ac
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_mbedtls.h
3 files changed, 33 insertions(+), 8 deletions(-)
configure.ac +4 -1
@@ -1072,7 +1072,10 @@ [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [0], [no])] ) if test "x$ac_cv_func_mbedtls_ssl_set_export_keys_cb" != xyes; then - AC_MSG_ERROR(This version of mbed TLS has no support for exporting key material.) + AC_CHECK_FUNC([mbedtls_ssl_export_keying_material]) + if test "x$ac_cv_func_mbedtls_ssl_export_keying_material" != xyes; then + AC_MSG_ERROR(This version of mbed TLS has no support for exporting key material.) + fi fi fi
src/openvpn/ssl_mbedtls.c +19 -4
@@ -251,8 +251,8 @@memcpy (cache->master_secret, secret,sizeof (cache->master_secret)); cache->tls_prf_type = tls_prf_type; } -#else /* if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ -#error either mbedtls_ssl_conf_export_keys_ext_cb or mbedtls_ssl_set_export_keys_cb must be available in mbed TLS +#elif !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) +#error mbedtls_ssl_conf_export_keys_ext_cb, mbedtls_ssl_set_export_keys_cb or mbedtls_ssl_export_keying_material must be available in mbed TLS#endif /* HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ bool
@@ -262,6 +262,20 @@ {ASSERT (strlen (label) == label_size); +#if defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT ) +/* Our version of mbed TLS has a built-in TLS-Exporter. */ + +mbedtls_ssl_context *ctx = session->key[KS_PRIMARY ].ks_ssl.ctx; +if (mbed_ok (mbedtls_ssl_export_keying_material (ctx, ekm, ekm_size, label, label_size,NULL ,0 ,0 ))) + { +return true; + } +else + { +return false; + } + +#else /* defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ struct tls_key_cache *cache = &session->key[KS_PRIMARY ].ks_ssl.tls_key_cache;/* If the type is NONE, we either have no cached secrets or
@@ -286,6 +300,7 @@secure_memzero (ekm, session->opt->ekm_size); return false; } +#endif /* defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ }bool
@@ -1226,7 +1241,7 @@mbedtls_ssl_conf_max_tls_version (ks_ssl->ssl_config, version); } -#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB +#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT )/* Initialize keying material exporter, old style. */ mbedtls_ssl_conf_export_keys_ext_cb (ks_ssl->ssl_config, mbedtls_ssl_export_keys_cb, session);
@@ -1241,7 +1256,7 @@* verification. */ ASSERT (mbed_ok (mbedtls_ssl_set_hostname (ks_ssl->ctx,NULL ))); -#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB +#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT )/* Initialize keying material exporter, new style. */ mbedtls_ssl_set_export_keys_cb (ks_ssl->ctx, mbedtls_ssl_export_keys_cb, session);#endif
src/openvpn/ssl_mbedtls.h +10 -3
@@ -85,14 +85,21 @@void *sign_ctx; }; -/** struct to cache TLS secrets for keying material exporter (RFC 5705). -* The constants (64 and 48) are inherent to TLS version and -* the whole keying material export will likely change when they change */ +#if !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT ) +/** +* struct to cache TLS secrets for keying material exporter (RFC 5705). +* Not needed if the library itself implements the keying material exporter. +* +* The constants 64 and 48 are inherent to TLS 1.2. For TLS 1.3, it is not +* possible to obtain the exporter master secret from mbed TLS. */ struct tls_key_cache {unsigned char client_server_random[64 ];mbedtls_tls_prf_types tls_prf_type;unsigned char master_secret[48 ]; }; +#else /* !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ +struct tls_key_cache { }; +#endif /** * Structure that wraps the TLS context. Contents differ depending on the
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1041?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1204bc2ff85952160a86f0b9d1caae90e5065bc4
Gerrit-Change-Number: 1041
Gerrit-PatchSet: 4
Gerrit-Owner: MaxF <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: cron2 <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged